restoring requests

5 files changed, 14 insertions, 84 deletions

diff --git a/src/routes/(app)/[username]/request/+page.server.js b/src/routes/(app)/[username]/request/+page.server.js
deleted file mode 100644
index b4a1e941..00000000
--- a/src/routes/(app)/[username]/request/+page.server.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import { redirect } from '@sveltejs/kit';
-import { auth, post } from '$lib/utils';
-
-export const actions = {
-	create: async ({ cookies, request, url }) => {
-		let form = Object.fromEntries(await request.formData());
-		let { id, requester } = await post('/requests', form, auth(cookies));
-		throw redirect(307, `/${requester.username}/request/${id}`);
-	},
-
-	delete: async ({ cookies, request }) => {
-		let form = Object.fromEntries(await request.formData());
-		let r = await post('/requests/delete', form, auth(cookies));
-	}
-};
diff --git a/src/routes/(app)/[username]/request/+page.svelte b/src/routes/(app)/[username]/request/+page.svelte
deleted file mode 100644
index 173c2c05..00000000
--- a/src/routes/(app)/[username]/request/+page.svelte
+++ /dev/null
@@ -1,40 +0,0 @@
-<script>
-	import { t } from '$lib/translations';
-	import { enhance } from '$app/forms';
-	import { Icon } from '$comp';
-	import { back } from '$lib/utils';
-
-	export let data;
-
-	let { subject, user } = data;
-</script>
-
-<button class="ml-5 md:ml-20 mt-10 hover:opacity-80" on:click={back}>
-	<Icon icon="arrow-left" style="w-10" />
-</button>
-
-<div class="container max-w-lg px-4 mx-auto mt-10 space-y-5">
-	<h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold">
-		{$t('payments.requestAnInvoice')}
-	</h1>
-
-	<form action="?/create" method="POST" use:enhance class="space-y-5">
-		<input type="hidden" name="requester_id" value={user.id} />
-		<input type="hidden" name="recipient" value={subject.username} />
-
-		<textarea
-			name="memo"
-			placeholder={$t('payments.describeOrder')}
-			class="w-full p-4 border rounded-xl h-48"
-		/>
-
-		<div class="w-full flex">
-			<button
-				type="submit"
-				class="bg-black text-white border rounded-full px-6 py-2 font-bold mx-auto"
-			>
-				{$t('payments.submit')}
-			</button>
-		</div>
-	</form>
-</div>
diff --git a/src/routes/(app)/[username]/request/[id]/+page.server.js b/src/routes/(app)/[username]/request/[id]/+page.server.js
index 542a3ccb..5fb90bf3 100644
--- a/src/routes/(app)/[username]/request/[id]/+page.server.js
+++ b/src/routes/(app)/[username]/request/[id]/+page.server.js
@@ -1,8 +1,10 @@
 import { auth, get } from '$lib/utils';
 import { redirect } from '@sveltejs/kit';
 
-export let load = async ({ cookies, depends, locals: { user }, params }) => {
+export let load = async ({ cookies, depends, params, parent }) => {
 	depends('app:invoice');
+
+  let { user } = await parent();
 	if (!user) throw redirect(307, '/login');
 
 	let { request } = await get(`/request/${params.id}`, auth(cookies));
@@ -19,5 +21,6 @@ export let load = async ({ cookies, depends, locals: { user }, params }) => {
 		if (request.requester.username === user.username) throw redirect(307, `/send/${id}`);
 	}
 
+
 	return { request };
 };
diff --git a/src/routes/(app)/[username]/request/[id]/+page.svelte b/src/routes/(app)/[username]/request/[id]/+page.svelte
index b061886e..b8dedbfc 100644
--- a/src/routes/(app)/[username]/request/[id]/+page.svelte
+++ b/src/routes/(app)/[username]/request/[id]/+page.svelte
@@ -1,6 +1,7 @@
 <script>
+	import { scale } from 'svelte/transition';
 	import { t } from '$lib/translations';
-	import { Avatar } from '$comp';
+	import { Avatar, Icon } from '$comp';
 	import { f, sat, sats } from '$lib/utils';
 	import { request as req, requestRedirect } from '$lib/store';
 	import { onMount } from 'svelte';
@@ -17,10 +18,10 @@
 	onMount(() => req.set());
 </script>
 
-<div class="container px-4 mt-20 max-w-xl mx-auto space-y-8">
+<div class="container px-4 max-w-xl mx-auto space-y-8">
 	<div class="text-center mb-8 space-y-5">
 		{#if request.recipient_id === user.id}
-			<p class="text-5xl break-words">
+			<p class="text-4xl break-words">
 				<span class="text-xl md:text-2xl">{$t('payments.sentInvoiceTo')}</span>
 			</p>
 			<div class="flex p-1 gap-2 justify-center">
@@ -34,13 +35,12 @@
 				<h3 class="text-secondary md:text-lg mb-6 mt-1">{sat(amount)}</h3>
 			</div>
 		{:else}
-			<p class="text-5xl break-words">
-				<span class="text-xl md:text-2xl">{$t('payments.sentRequestTo')}</span>
-			</p>
-			<div class="flex p-1 gap-2 justify-center">
-				<Avatar user={request.recipient} size={20} />
-				<p class="text-4xl break-words my-auto">{request.recipient.username}</p>
+			<div class="flex w-full max-w-[200px] mx-auto py-20" in:scale={{ start: 0.5 }}>
+				<Icon icon="check" style="mx-auto" />
 			</div>
+			<p class="text-3xl">
+				{$t('payments.sentRequestTo')}
+			</p>
 		{/if}
 	</div>
 </div>
@@ -49,4 +49,4 @@
 	<div class="opacity-0 w-screen h-screen fixed top-0 left-0 z-50" />
 </a>
 
-<div class="fixed bottom-10 w-full text-center">{$t('payments.tapAnywhere')}</div>
+<div class="fixed bottom-10 left-0 text-center w-full">{$t('payments.tapAnywhere')}</div>
diff --git a/src/routes/(app)/[username]/request/sent/+page.svelte b/src/routes/(app)/[username]/request/sent/+page.svelte
deleted file mode 100644
index 4995bfb2..00000000
--- a/src/routes/(app)/[username]/request/sent/+page.svelte
+++ /dev/null
@@ -1,18 +0,0 @@
-<script>
-	import { scale } from 'svelte/transition';
-	import { Icon } from '$comp';
-
-	export let data;
-	let { subject } = data;
-</script>
-
-<div class="container px-4 text-center mx-auto">
-	<div class="flex w-full py-20 max-w-[200px] mx-auto" in:scale={{ start: 0.5 }}>
-		<Icon icon="check" style="mx-auto" />
-	</div>
-	<h1 class="text-3xl md:text-4xl font-bold mb-6">Request sent</h1>
-</div>
-
-<a href={`/${subject.username}`}>
-	<div class="opacity-0 w-screen h-screen fixed top-24 left-0 z-50" />
-</a>